bitkeeper revision 1.160.3.1 (3ea53c71xG2JEZ0LCbFRAxt9kayWBw)
authorach61@labyrinth.cl.cam.ac.uk <ach61@labyrinth.cl.cam.ac.uk>
Tue, 22 Apr 2003 12:58:25 +0000 (12:58 +0000)
committerach61@labyrinth.cl.cam.ac.uk <ach61@labyrinth.cl.cam.ac.uk>
Tue, 22 Apr 2003 12:58:25 +0000 (12:58 +0000)
commit61a664017f391947bda0466cfd1ef03959661e20
treeb7920eafb085559513105c2dabc0f12388b685d9
parent40d269696c5de58c38df86d11f7debfb970c474d
bitkeeper revision 1.160.3.1 (3ea53c71xG2JEZ0LCbFRAxt9kayWBw)

fix earlier merge problems
user space virtual disk manager
23 files changed:
.rootkeys
tools/vdmanager/build.xml [new file with mode: 0755]
tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Extent.java [new file with mode: 0755]
tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Library.java [new file with mode: 0755]
tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Main.java [new file with mode: 0755]
tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Mode.java [new file with mode: 0755]
tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Parser.java [new file with mode: 0755]
tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Partition.java [new file with mode: 0755]
tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/PartitionManager.java [new file with mode: 0755]
tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualBlockDevice.java [new file with mode: 0755]
tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDisk.java [new file with mode: 0755]
tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDiskManager.java [new file with mode: 0755]
tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/XML.java [new file with mode: 0755]
tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/XMLHelper.java [new file with mode: 0755]
tools/vdmanager/vdmanager [new file with mode: 0755]
xen/drivers/block/xen_block.c
xen/drivers/block/xen_segment.c
xen/drivers/ide/ide-disk.c
xen/include/xeno/sched.h
xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.c
xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_segment.c
xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_segment_proc.c
xenolinux-2.4.21-pre4-sparse/drivers/block/genhd.c [new file with mode: 0644]